Merge OpenSearchXml extension into core