Track verbose and verbose_internals
#120159
+7
−6
Merged