merge 2.21,2.23,3.5 confilicts
merge 2.21,3.5 confilicts
correct 2.21 code mistakes
correct 2.21 code mistakes
Merge pull request #178 from stanzhai/develop

【校对】解决一些冲突，修复一处代码错误