Merge branch 'dev' for v2.1.0