v3.6.22
Merge v2.11 into v3.6
Merge current v2.11 into v3.6
Fix CORS Max-Age set to 0 by default
chore: update linter