OCL API 2

Build: #1796 failed

Job: Build oclapi2 was successful