Back port cron update from Bolt 2