Merge "Added UUID to policy ids and new policy types"