Merge branch 'bugfix/null-scheduled-at' into 'develop'