master
Merge branch v3.6 into v3.7
Introduce trace verbosity config and produce less spans by default