[DF-2110] path for composite objects like skybox is determined correctly
Merge branch 'origin/development'