merge v3.0