Merge of both OCR projects.