master
Add back explicit categories where needed
FastTimerService: implement plots vs. number of pixel clusters