Merge branch 'jt/tag-following-with-proto-v2-fix'