Merge branch 'release/2.1.2' into 'stable'