issue #20734: Final touches to shipping cycle.