OCL API 2

Build: #1938 was successful

Job: Build oclapi2 was successful