hwlocality

1f728f63 - Merge branch 'main' into check-in-lockfile