shujing - Fixing bad merge for scene.