Apply vanilla 3.16.1 patches