Merge branch 'v1.2'