Merge "Remove mismatched COMMIT from FileDeleteForm"