initial mediaserver commit