Merge "Fix inconsistent MIME type mapping." into rvc-dev