Fixed sync nature of rollback.
Merge branch 'test' into dev