Bug 868974: support master randomization