Fix bad merge
Merge branch 'batchingdebugcommand' into gltf