apply m3 related changes