Merge conflict merging dev into feature/362-trial-walkthrough

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