diverse changes
diverse changes at kernel and merge fix