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