Improve media-optical (merge from upstream)