A PR is sent for 5.6.x , hope that will be merged asap https://github.com/hibernate/hibernate-orm/pull/5261/files