Merge "Add new policy types"