Merge branch 'ap/combine-diff-coalesce-lost'