Cherry pick h2 fix