Merge: Just some more merging from LZKernel