[CodeBundle] Update Kernel to match latest changes
Merge pull request #1353 from stloyd/patch-1

[CodeBundle] Update Kernel to match latest changes