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