comment media dependencies (temporarily)
Merge branch 'hotfix-comment-media-from-master'