DF-3170
Merge branch 'feature-integration-new-materials' of https://github.com/dava/dava.framework into feature-integration-new-materials