Merge pull request #18743 from vingle/patch-9