Merge branch 'jk/drop-sha1-entry-pos' into next