Merge pull request #1882 from philippefoubert:branch_ocl_instrumentation