Fix wrong initialState in automaton
Merge remote-tracking branch 'origin/master' into platform