Fix fetch task not signaling shard EOF (#4714)

Fix fetch task not signaling shard EOF (#4714) #2221