Fourth partial merge of the condrv_restructure branch, with fonts improvements.