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

* commit '050a8a050de04bd0098cde8fdf665a7202929ee0':
  DO NOT MERGE Fix finalizer ordering/double-free issue