hotfix in live debugging stuff
Merge branch 'hotfix/session_trouble'