Fixed an error in the media manager facade
Merged 4.0 branch