OCL API 2

Build: #2073 failed

Job: Build oclapi2 was successful