[DF-3114] fix for crash
Merge branch 'origin/feature-integration-new-materials'