The HHH-9685 idea makes sense, have you tried creating a patch for that? I'm removing myself as the assignee for this issue as I don't see that any code changes are needed for it. This sounds more like a discussion that is heading towards understanding why a problem is occurring.