Added support for optional exclusion of Discussion Question.