Merge "Merge branch 'stable-4.1'"