Emmanuel Bernard, pushed an update to ORM PR https://github.com/hibernate/hibernate-orm/pull/851. With that it's good to go from my side. Can you handle it?

Once that is in, ORM has been released and we have updated OGM to use that version, we can remove the the work-around in OGM.