Merge branch '1.2.0'