As far as I can tell, this is still a problem in hibernate 5. The testcase along with the fix that are included in the PR are short and easy to understand. The problematic code section did not really change since then so you can actually apply that easily. If you really want a PR for that for the master, I can provide it.