allow overriding the distribution
Merge "allow overriding the distribution"