Remove media info
Merge branch 'Issue2009' into bootstrap