Merge "Update debug.c and debug.h"