merge 3.5