Merge 3.2 fixes