A Pull Request has been created to bring in the code changes https://github.com/hibernate/hibernate-orm/pull/556.