Merge "Add support for a cron override with merge job"