Apply vanilla 3.11.0 patches
Merge master 3.11.0 branch