Merge change 27169 into eclair

* changes:
  Improved object lifecycle tracking and fix leaks.