[DF-575]: extra changes.
[DF-575]: extra changes - merged to feature-new-materials.