merge 3.0.60