Merge conflict merging dev into feature/868-HH-Naming-Fix

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