OCL API 2

Build: #1579 failed Changes by Sunny Aggarwal.