I've created a PR with the changes and a unit test (https://github.com/hibernate/hibernate-ogm/pull/598). Also submitted signed contributor license agreement.