Merge embed-medias into master