[DF-3048] SetParent instead of AddChild/RemoveChild
Merge branch 'origin/feature-integration-new-materials'