[query] Accept multiple include constraints
Merge branch 'include' into working