Merge pull request #11572 from neheb/crrrrr