Add fix in collada loader
Merge branch 'dev' into public-cloud