Merge change 5413 into donut

* changes:
  Need to write the correct float math.