merge 3.0.10