Merge branch 'blur-effect'