Issue #2257727 by dsnopek | rodrigoaguilera: Fixed update 7007 fails if field exists.