update todo
Merge branch 'cumu' into release

* cumu:
  update todo