Merge "Add directory for mediaserver"