m6
merge m6 and b3_7