Apply more m3 patches

milestone3