Merge: from main (yeah, weird one - redo of CL 143929) When I did a server merge from extend_perf_telem, plastic warned me that another change made it to main, but commit bot reported mine merged. In reality it wasn't fully merged, just "attached". This should fix it. Tests: compiler simulator in editor