merge 3.0.11