The fix for HHH-10545 + HHH-10546, was also merged to the Hibernate ORM master branch, so the 5.1.1 release should include the fix.