Merge "Geometry Batching" into devel/master