b3_7
merge m6 and b3_7