Merge pull request #9477 from neheb/rng