OCL API 2

Build: #1739 failed Changes by Sunny Aggarwal.