Merge "Merge branch 'v1.1'"