Andya/cohort preview 3

TNL-651.

Some code review has already been done on #6258. See that PR for sandbox information.