Hotfix/media policy

Fixes #12