Merge change 6742

* changes:
  fix [1969200] Uninitialized double passed to Math.sqrt()