Fix pre-intial handling after restart.
Added a new test suite.
Merge pull request #957 from hjoliver/956.fix-831

Fix pre-intial handling after restart.