Merge branch 'jt/test-protocol-version' into jt/fetch-no-update-shallow-in-proto-v2