[DF-2864] changes and fixes
Merge branch 'origin/feature-integration-new-materials'