Merge "Add trace support to usagestats" into main