Running from dist
Merge remote-tracking branch 'origin/coco_list_optimization'