Merge "Add feature flag check for setting groupKey"