Merged new OpenCL4.0 code to the master.