Merge 1.2.0 to the Master branch