I have added a PR: https://github.com/hibernate/hibernate-orm/pull/1850

Let me know if I should do any more adaptions the the commit before the PR could be accepted.