Merge branch 'ks/combine-diff'