Merge "Make clear SID delete the file"