OCL API 2

Build: #1197 failed

Job: Run tests was successful