Merge branch 'nd/extended-sha1-relpath'