Merging patch0006 changes to kernal
Merging patch005 to kernal
Merging patch0004 changes
Resolved merge conflict and commit