KRACOEUS-6955 : Common Questionnaire answer
KRACOEUS-7334
Merge pull request #325 from yyuan1/0618_common

KRACOEUS-6955 : Common Questionnaire answer
Merge pull request #328 from anithapolus/KRACOEUS-7334

KRACOEUS-7334