Merge conflict merging dev into feature/15-error-notifications

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