Pushed to master and 5.3 branches.
I've opened a PR for 5.4 branch: https://github.com/hibernate/hibernate-orm/pull/3345