Merge pull request #19134 from mglaman/patch-2