Register session scope
Merge remote-tracking branch 'origin/multiuser' into development