Merge branch 'stable-2.0'