Merge branch 'hotfix/address-user-and-address-copy-update'