Fix mis-matching id on activity type
Merge branch 'c4c.staging.discover-v2' into c4c.staging