use the new mediaManagement interface
Merge branch 'develop' into media-manager
Merge branch 'media-manager' into develop