Merge "Make DND logs more useful" into main