issue #20734: Get automatic distribution to default working.