[DF-2992] some changes for new material structure
Merge branch 'origin/feature_refactor_new_materials'
[DF-2992] some changes to new material structure
Merge branch 'origin/feature_refactor_new_materials'