Merge branch '3.2'