merge 3.2 to 3.5