Merge "Merge branch 'stable-5.1'"