master
Introduce trace verbosity config and produce less spans by default
Merge branch v2.11 into v3.4