Merge conflict merging dev into feature/381-default-settings-oninstall

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