Merge "Use file extension based on MIME type"