Merge "Fixes in OxmModelLoader"

No match.