Merge branch 'jt/v2-fetch-nego-fix'