Use H2, not HyperSQL for most things.
Merge remote-tracking branch 'upstream/master'