Merge "Add kernel service"