Merge branch 'jc/diff-irreversible-delete'