[#WIZ-256] Support for XDS | also corrected typos