Multimedia: Applied #4140 to v4.0