I have created the patch to fix the above issue.
After patch:

Needs review