Feature/module selection

Merged username-removed-200472 requested to merge feature/moduleSelection into develop