[US137] Unify proto