Fix for UATNBNXR062 - 3rd Reverted (Partial)

Pending checking on Payor address to XML