Merge "Fix debug info message"