Merge "Test rollback not triggered when crashing under the threshold (2/n)"