[DF-29] fixes for FastNameSet and HashMap
Merge branch 'origin/feature-integration-new-materials'