Merge branch 'ap/diff-ignore-blank-lines'