Merge pull request #20792 from cpuguy83/more_stats_client_cleanup

Fixes issue with stats on start event