merge 3.0.12