Merge pull request #3503 from the2masters/rng-tools