Merge branch '2170-matid-package-update' into 'develop'

Updated matid, fixed test that fails due to too much overlap between atoms.

Closes #2170

See merge request !2154