I have created the patch to fix the above issue. Needs review