merge ocr-rb with oce-rb-core