Merge "Remove further randomness when calling ddt.data()"