merge v3.1