Apply m3 patches

milestone3