fix: set question in session
Merge branch 'NewInfraBranch'