[DF-3553] variuos fixes for refactoring
Merge branch 'origin/DF_3553_development_material_refactor'