Merge pull request #19125 from hirnpfirsich/master