I've created a patch for this issue:
and I had some positive reviews about it.
I'm not sure about how to proceed with the process of 'verification'
of the patch, but I understand I have to inform here so you are aware
of it (as mentioned on contributor guide).
Let me know what you think about it.