Decouple Core from media types #1627
+557
−215
Merged
Loading