Merge change I5113aaa7

* changes:
  Fix apicheck break. Adding synchronized to reset() is API compatible