Merge "Fix issues with RollbackTest"