Merge remote-tracking branch 'ap-ensighten/bug/non.streaming.jar' into fix_fetch_counters
Fix counter fetching when non streaming jars are interleaved with streaming jars