Merge pull request #21876 from mariav0/patch-14