Merge "change some rc_new to rc_type == RC_NEW"