[Change] more consistent debug logging