issue #20734: Incremental progress on issue to shipping screen.