Hi guys, I looked the PR https://github.com/hibernate/hibernate-ogm/pull/961 and I would integrate the work into a new PR, if you are agree, solving this issue and OGM-1405 Open similar issue.