This looks very similar to HHH-5255, which also has a pull request.
Unfortunately, that ticket is also mostly ignored

Btw, the pull request for 4.2 was declined as it seems that branch will not get any more updates.