Merge change I4e5c1c26

* changes:
  Fix use of memset function