Merge branch 'v2.1-dev' as v2.1.2