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