Fix.
Merge branch 'OCR' into testing