Merge conflict merging dev into feature/929-Household-and-opps

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