Working on h2 support
Merge branch 'develop'