Merge "Reduce tech debt in policy-management"