Merge branch 'jt/fetch-nego-tip' into ab/fetch-nego