Merge branch 'jc/fetchupload' into next