Aply vanilla 3.16.2 patches