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