Missing media types #3586 to support

Merging #3586 for later forwardporting