merge m3-dev to rc