Merge changes from topic "revert-1445-revert-1443-FEGNGJECHO-ZDOINMGPHW"

* changes:
  Revert^2 "api忘改回来了"
  Revert^2 "11"