Fix neat-feature h2
Merge remote-tracking branch 'origin/master'