Merge branch 'tg/next/add_user-agent_opt' into next