Merge branch 'stable-3.7'