Apply vanilla 3.10 patches
Merge vanilla 3.10 patches and resolve conflicts