mediamanager code revision for clear build