Final commit for experimental transition to protocol v1