Merge branch 'sb/diff-delta-remove-needless-comparison'