Merge from h2 history