Merge pull request #6052 from mikeller/change_setpoint_weight_to_decimal_scaling