issue 20734: Add issue to shipping function. Scale back scope.