Trying to fix the state change.
Merge branch 'test' into dev