Consent group edit bug

Sync with master.