am a1ce3043: Merge "Fix memory leak due to smart pointer misuse."

* commit 'a1ce30435d27a83b941e297a94b144b52d01ad31':
  Fix memory leak due to smart pointer misuse.