remove the wait for event in the test because it might happen that the event is already finished when we wait it
Merge branch '6.3.x'