Merge branch 'tg/next/1.0_cleanup_quvi_util.lua' into tg/next/1.0