Backport cron update from Bolt 2

Fixes #1817