A follow up on HHH-10812 Resolved which was specifically meant for branch 5.1 of Hibernate ORM.
We need this feature ported to master and future versions too.