Artifacts of ocl-master #504