Merge conflict merging dev into feature/47-hhaccount-conversion

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