[DF-2992] fixes for new materials
Merge branch 'origin/feature-integration-new-materials'