Merge branch 'release/3.1.2' into 3.1-stable