fix: set question in session. (lost in merge)
Merge branch 'NewInfraBranch'