Merge branch 'sg/t3600-nul-sha1-fix'