Merge branch 'jc/merge-blobs' into maint