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