[DF-478] SceneGraph refactoring - recovered changes lost during merge.