OCL API 2

Build: #1547 failed Changes by Sunny Aggarwal.