Fix longpolling.
Merge branch 'dev-fix-long-polling' into dev