Version 3.1.2
Merge branch 'release/v3.1.2' into develop