Merge branch 'scene'