Merge change I1acdca65

* changes:
  Fix memory corruption.