Merging with current kernel changes