Merge 1.2.0 complete