Finish sceneEditor 5-2-1 to 5-2-3.
Merge commit '8d77dde7767a16d0425d9e5398e249dc728a49aa'