v3.6.21
Merge branch v2.11 into v3.6
Merge current v2.11 into v3.6
Make encoded character options opt-in