Merge "Merge branch 'stable-3.3'"