Merge -c31770 ^/trunk/SHERPA .
Original commit message: Apply ratio from overweight threshold to vars