Refactor: Rename db locals to diag
#65428
+40
−40
Merged