Merge "Fix CC root visiting bug"