OCL API 2

Build: #1498 failed Manual run by Rafal Korytkowski