Merge in updates from CM Kernel.