merge v3.1.9