Making random numbers at the scenario level.
Merge branch 'master' into release