Merge 1.2 -> v1 branch