Added helper functions to build simple question and other question.
Merge remote-tracking branch 'origin/integration' into integration
Merge remote-tracking branch 'origin/integration' into integration