Use new GC API.
8 files changed