Fix/master/issue 3415

Fixes #3415
@mdogan such as CountdownLatch or timer ?