am 0e7c13a1: (-s ours) am 413a6812: am 4734b67d: am 050a8a05: DO NOT MERGE Fix finalizer ordering/double-free issue

* commit '0e7c13a143ceec3f84e50b0a89ad0399345f9b2a':
  DO NOT MERGE Fix finalizer ordering/double-free issue