Merge branch 'ap/combine-diff-ignore-whitespace' into maint