Issue #21753:correctly handle change to dropship
Merge pull request #193 from garyhgohoos/21753

Issue #21753:correctly handle change to dropship