Corrected the initial skipping of other nodes' lines when restoring a session
Merge branch 'master' into bleeding-jumbo

* master:
  Corrected the initial skipping of other nodes' lines when restoring a session