Add missing includes
Json encode/decode the request
Merge remote-tracking branch 'origin/no_celery' into no_celery