Merge v1.2.0