Merge branch 'tg/next/1.0__doc_quvi_modules' into tg/next/1.0