Revert "Revert Merge branch 'master' from wenlan"

This reverts commit dfeb3530181549cf78cba56f161de163dc3d47f2.
resolving manual api confict