am 4734b67d: am 050a8a05: DO NOT MERGE Fix finalizer ordering/double-free issue

* commit '4734b67dc56950f93da385d3d59b06b0058cf33b':
  DO NOT MERGE Fix finalizer ordering/double-free issue