Allow the initial state to be set explicitly.
Merge branch 'refs/heads/initial_state'