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