null merge 3.2 (patch already applied to 3.3)