OCL API 2

Build: #1938 was successful

Job: Check formatting was successful