am 1c0a0381: Merge "Enable functional DSO object destruction"

* commit '1c0a0381dfb3648ffadef9537ec9383d63d62473':
  Enable functional DSO object destruction