Merge branch 'br/sha1-name-40-hex-no-disambiguation'