Merge branch 'bugfix/mrf-simple-media-stripping' into 'develop'