Issue 3165: Adding Questionnaire page