Merge pull request #21888 from mariav0/patch-26