Merge 3.2.2 fixes