do not throw exception in function waitForMessage
do not throw exception in function waitForMessage
Merge branch 'master' into test
Test files matched