Issue #21753:correctly handle change to dropship