Merge branch 'stable-4.3'