issue #20734: Add locations to issue to shipping.
issue #20734: Remove cruft.