Merge branch '1.2.2' into 1.3.0