Merge "Merge branch 'stable-3.2' into stable-3.3" into stable-3.3