Partial merge of the condrv_restructure branch, including: