OCL API 2

Build: #1938 was successful

Job: Run tests was successful