Merge branch 'tg/next__fix_tests' into next