Merge "Reducing the wait time for events for less than the Test timeout" into main