Merge change 5383

* changes:
  Oops, need to hide the new api.