Forward port the Console session increase

Original commit was #e1a295a by @klynton