Merge pull request #15939 from sudovijay/patch-11