Merge branch 'cpquery'