Merge branch 'release/2.1' into develop
fix BUG.
 - client does not timeout if recv data from backends.
Merge branch 'release/2.2'