[WIP] Some further improvements for the scenario when old values for the
given field in both objects are different.