Merge "Reference kernels in new location"