Merge lightningkat kernel (forked from Slim