Merge "modified internal delegate to private to avoid deletion by GC"