OCL API 2

Build: #1561 failed Changes by Rafal Korytkowski