OCL API 2

Build: #1739 failed

Job: Run tests failed