Merge branch 'stable-3.5'