am 81aedc7b: Merge "Refactor and improve GC root handling"

* commit '81aedc7b2f2e8b990d74d6dfa5303ab2447327a1':
  Refactor and improve GC root handling