Renamed sort_add_and_weights to sort_weights.

4 jobs for develop in 16 minutes and 38 seconds (queued for 1 second)