Merge "Address some GC comments"