Update for upstream refactoring regarding debug log messages