Merge pull request #22228 from colemanw/managedGroup