Merge conflict merging dev into feature/554-custom-hh-naming

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