Just to give you feedback: Your changes are working fine for me! Tested with hibernate-core-5.1.0-SNAPSHOT.jar from yesterday. Thank you very much!
Best regards,
Carsten