Merge branch 'tg/next__quvi_version__build_cflags' into next