Merge "Remove error thrown when running rm <file> for a nonexistent file" into main