Merge change 23548 into eclair

* changes:
  Fix some sign in errors.