Merge conflict merging dev into feature/859-schedulable-permissions

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