Merge "Added policy-distribution to policy"