Dc/Melanie |#4148| Merging media-changes branch