merge 3.6