Merge branch 'hotfix/site_fdb'
hotfix in live debugging stuff
Merge branch 'hotfix/session_trouble' into develop