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