Multimedia: Applied #4140 to v4.0
Merge pull request #4156 from LaurentGoderre/multimedia-fixes

Multimedia: Applied #4140 to v4.0