simple test OK, cpplint OK
Merge branch 'release/client_async_wait' into develop