OCL API 2

Build: #1561 failed

Job: Run tests was successful