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