Merge 1.2.0 pre-release