CLSN-1868 change done for AddressUpload