Handle multi-threaded attach/detach gracefully
6 files changed