Make multipart name optional, close #2207