Merge branch 'jt/fetch-negotiator-skipping'