merge backend changes from uwsgi cron branch