Merge branch 'dev'(v1.1)