Merge 1.2 fixes in master