Merge main into dev for v2.1.0 release#406

erikdarlingdata merged 6 commits intodeverikdarlingdata/PerformanceMonitor:devfrom

release/v2.1.0erikdarlingdata/PerformanceMonitor:release/v2.1.0Copy head branch name to clipboard