Merge conflict merging dev into feature/859-schedulable-not-supported

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