Merge "[RESTRICT AUTOMERGE] Fix std::unique_ptr error with incomplete CommonFeatureGroup" into main