parallelization fix
XMerge remote-tracking branch 'upstream/master' into feature/parallelization_fix
Merge remote-tracking branch 'upstream/master' into feature/parallelization_fix
fixed tests
Merge pull request #221 from JWUST/feature/parallelization_fix

Query Transformation Fix
Merge remote-tracking branch 'origin/master' into feature/kh-genericbetween