Merge change 20002

* changes:
  Updating math to Harmony r772995.