This branch currently contains two commits [0, 1] that I made against master for non QueryEngine improvements that where needed to get the tests for the QueryEngine component to run on their own. So it'd be good to have these reviewed first, then merge master into sqlstore, and no longer have them in the diff there.