Merge "Add group-based-policy to blacklist"