Merge "Add filename and line number in the debug messages."