Rebase back to Slim Kernel