Merge "Don't fall back to copy during rollback tests (5/n)" into sc-dev