Revise handling of timed out sessions
Merge in session failure changes