Fixes #8320 - shutdown shell provider threading fixed