Merged master with hybrid-hash-join branch.