Merge branch 'query-integrator' into cacheJoin