Fixes: Fix race-condition when threads are killed during shutdown
# Needs careful review to determine if this is still needed. Deferring.
Disabled: true
