Fixed problem of state changes not showing.
Merge branch 'test' into dev
Merge.