Auto-634 Remove the Underscore in arbitrary log fields