Merge branch 'ab/fetch-nego'