[core_scene] performance fix
Merge branch 'master' into core_scene