Merge branch 'v2.1-dev'