Merge pull request #21880 from mariav0/patch-18