Merge "Remove dependency on TypedXml Parsing" into main