Merge pull request #19080 from seamuslee001/master