Merge conflict merging dev into feature/208-settings-ui

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