Merge branch 'rs/combine-diff-zero-context-at-the-beginning' into maint