fixing query interruption on HTTP connection close
Merge branch 'grey_issue_1932_v2' into next
Merge branch 'next' into sam_alt