Merge branch 'jc/fetch' into next