MODIFIED: disconnect and sessionscoped to userManaged
Merge origin/develop into develop