Merge "Add extra debug log file"