Issue #2350213: Fix for broken workflow test