Merge branch 'mantis-165' into dev
rework for the optimize tables cron
Merge branch 'dev'