hwlocality

dba55889 - Merge branch 'main' into check-in-lockfile