Fixed build error for next
Merge remote-tracking branch 'origin/fix_next' into next

* origin/fix_next:
  Fixed build error for next