Merge branch 'es/test-cron-safety'