Merge branch 'v3-2-stable' into my_branch