Merge "Cancel the transaction if the file fails to move. This prevents losing files...