Merge pull request #21887 from mariav0/patch-25