Merge branch 'jc/fake-ancestor-with-non-blobs' into maint