Hi!

I create new PR for review. https://github.com/hibernate/hibernate-ogm/pull/846

I begin to merge current changes of master branch and fix conflicts.