Steve Ebersole I took this ticket from you, I hope it's alright. I wanted to fix the problem in 5.4.

I sent a PR here: https://github.com/hibernate/hibernate-orm/pull/2888

I can help to port it to ORM 6, I already have a branch for that but couldn't test because of StatelessSession, which doesn't work in ORM 6 yet.
Just tell me if you need another PR to wip/6.0, or ping me when you need to rebase wip/6.0 on master.