Merge 3.2 (empty, patch already applied to 3.3)