Merge commit 'origin/v3-2-test' into my_branch