forward port fix/sessiontimeout