Merging patch0006 changes to kernal