Merge: More merging from LZKernel