Merge pull request #17969 from graysky2/rng-tools