Updated patches and scripts to target 2.10.x