Rebase on Omni Kernel