merge 3.4