Merge branch 'np/diff-in-corrupt-repository'