fix socket session
Merge branch 'fix-socketio' into develop