Merge "Update all debug directives."