Merge branch 'jt/fetch-nego-tip'