Merge branch 'release/2.1.2'
Merge tag '2.1.2' into develop

Tagging version 2.1.2 2.1.2