Merge "More robust GC verification and corruption dumping"