merge 3.5.1