Improve performance via length list
Merge branch 'czchen/10029'

* czchen/10029:
  Improve performance via length list