Merge branch 'tg/next/1.0' into next