Extend #1642 to include FeatureGroups.