Merge pull request #12633 from DougGregor/sr-6100