Merge branch 'tg/next__media_port_collegehumor.lua' into next