Merge pull request #17245 from agh1/chevrons