Merge conflict merging dev into feature/722-addr-verif-status

mrbelvedere tried to merge new commits to dev but hit a merge conflict.  Please resolve manually