Merge branch 'bw/protocol-v2' into jt/partial-clone-proto-v2