I've pushed my changes to master, 4.3, and 4.2. The new dialect fixes the tests that were failing in HHH-9444.
I'll leave this open in case other tests fail with the new dialect.