Resolve "deadlock caused by race between start stop and wait"

Merge request reports