Merge conflict merging dev into feature/499-hh-account-lookup-filters

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