[DF-2864] fix for save/load
Merge branch 'origin/feature-integration-new-materials'