I have added a commit my local fork for this: https://github.com/Naros/hibernate-orm/commits/HHH-8051