Merge 1.2.x into master