Merge branch '3.2.x' into 3.3.x