Merging patch005 to kernal