Merge in fields_changed patch