Merge pull request #19340 from maynardsmith/master