Merge branch 'tg/next__101gg_fixes' into next