Merge branch 'release-v2.1.2' into release