[[ Bug 12517 ]] Several problems with the multimedia refactoring fixed
Merge pull request #777 from runrevali/bugfix-12517

Bugfix 12517