Merge branch 'jk/proto-v2-ref-prefix-fix'