Fix deadlock on teardown

Merge request reports