PR is merged. Leaving this issue open as a reminder to fix one remaining minor issue mentioned at https://github.com/hibernate/hibernate-ogm/pull/492.