Merge branch 'tg/next/1.0_port_media_scripts_from_0.4' into tg/next/1.0