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