Merge branch 'mk/combine-diff-context-horizon-fix' into maint