Merge change 24610

* changes:
  Several small native code fixes.