[DF-47] Fix: intermediate commit
Merge branch 'feature-new-materials' of github.com:dava/dava.framework into feature-new-materials