Merge pull request #21875 from mariav0/patch-13