case 3213 - Improve cron job.
Merge branch 'case-3213' into develop

* case-3213:
  case 3213 - Improve cron job.