Merge "Fix leaks due to GC circular references."