Merge branch 'MDL-68768-adhoc-task-faildelay-check' of https://github.com/brendanheyw...