PM-593 redesign logging