Merge "Adding native policy types to defaultGroup"