Implement fix for Hibernate HHH-9389