Issue #22538:avoid clearing shipto number inadvertantly