Merge pull request #19419 from james-mcguire/master