Merge master to gltf and fixes