Merge "DO NOT MERGE Add test to check for duplicate random output" into jb-dev