Merge pull request #14496 from neheb/r