delete disabled pop in pop_sort_by_weight
Merge remote-tracking branch 'origin/i1'