Merge pull request #19114 from JDevlieghere/master