Merge "Changes following "Remove Geometry scene object"" into devel/master