OCL API 2

Build: #2073 failed Rebuilt by Sunny Aggarwal.