Merge conflict merging dev into feature/660-mobile-research

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