Merge branch 'tg/next/1.0__revise_quvi/const' into tg/next/1.0