Merge pull request #4527 from VishnuSanal/hotfix/3.11.2