OCL API 2

Build: #1463 did not complete Changes by Rafal Korytkowski