OCL API 2

Build: #2141 failed Changes by Rafal Korytkowski