Merge 1.2 onto 1.2.z branch