Merge early part of branch 'jc/fetchupload'