Merge pull request #119807 from laomengwa/master