Merge "Merge branch 'stable-3.4' into stable-3.5" into stable-3.5