Backport cron update from Bolt 2