Debugging in scenes
Merge origin/master