Merging modifications for v1.2.0