Merge pull request #21889 from mariav0/patch-27