OCL API 2

Build: #1796 failed Changes by Sunny Aggarwal.