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