Mediacore Integration Followup

Followed up from Stuarts branch with some additional testing and fixes.

Self-review complete from my changes, and this is now ready for review. Assigning to @simong