Merge conflict merging dev into feature/409-address-mgmt

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