merge the kernel debug option from r22325