Merge branch 'nd/sha1-file-delta-stack-leakage-fix'