Merge pull request #19708 from J0WI/patch-1