Apply vanills 3.8.5 patches