Merge pull request #21286 from vingle/patch-13