Merge pull request #13441 from greenpeace-cee/fix-schema-parsing