Media bubbling and mergin. Part of #42