Forward port the Console session increase

Original commit was #e1a295a by @klynton
Merge pull request #374 from binford2k/forwardport/session_lifetime

Forward port the Console session increase