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