Merge branch 'jh/note-trees-record-blobs'