Merge conflict merging dev into feature/821-addr-verif-https

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