fix a bug
Merge branch 'feature-list-debug' into feature-list
Merge branch 'feature-list' into develop