Merged from ultrakernel