I have added the patch for 11.x. I have addressed the issue. please check.