Align with latest proposal of wire proto frame