Merge pull request #14801 from Noltari/rng-tools