WIP: new query/index implementation
WIP: new query/index implementation
Merge remote-tracking branch 'origin/3.0' into 3.0