Fixed rollback state..
Merge branch 'test' into dev