Merge v3.0