Small changes
Merge branch 'TJSceneDev' into Dev