Cherry pick working with h2 from master