Merge conflict merging dev into feature/883-hierarchical-custom-settings-2

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