Merge branch 'v1.2-dev' as v1.2.2