Store now uses the correct state.
Merge branch 'test' into dev