FOR BDRRMO: restricted sessions and signup-user type
Merge origin/master