v3.7.0
Merge branch v3.6 into v3.7
Merge current v2.11 into v3.6
Add providers routing precedence configuration