Merge branch 'jk/patch-corrupted-delta-fix'