Merge "Remove "$that" from SessionManager"