version 2.1.2
Merge branch 'release/v2.1.2' into develop