Merge "Add support for pipelining queries" into pi-dev