Merging patch0005 changes to kernal