Merge pull request #18913 from tvartom/master