fix bug :list
Merge branch 'lxj' into develop