Thanks for looking into this.
Can this be fixed within hibernate? Any change a fix makes in in before the final 5 release?