[DF-2992] fix for save/load
[DF-2992] fix for sorting materials (sorting key constructed as in old materials)
Merge branch 'origin/feature-integration-new-materials'