Merge "Fixes in OxmModelLoader"