Changes to separate discussions from cohorts and always cohort inline discussions