OCL API 2

Build: #1498 failed

Job: Run tests was successful