Merge branch 'bw/protocol-v2'