returned cli_session_setup to previous behaviour. added a couple of