Merge commit 'cce7dbc31ed100b39c3e1174dd3d9a01de648e5b' * commit 'cce7dbc31ed100b39c3e1174dd3d9a01de648e5b': Re-enable query jamming.
Merge commit 'cce7dbc31ed100b39c3e1174dd3d9a01de648e5b' * commit 'cce7dbc31ed100b39c3e1174dd3d9a01de648e5b': Re-enable query jamming.