Merge #711: last common value in conflict change events (fixes #706)