WP-1147/WP-1148/WP-1157
Merge pull request #37 from gguowei/wp-1147

WP-1147/WP-1148/WP-1157