Merge "Add support for pipelining queries"