Merge pull request #3056 from akarsakov:ocl_setIdentity_fix