Partial merge of condrv_restructure branch r65657.