Merge 3.2.x into master