Fix some conflicts on multimedia patch
Merge pull request #1 from OliverG96/cm-10.2

Fix some conflicts on multimedia patch