Merge pull request #17255 from agh1/sr-only