Merge branch 'release/0.12.1'
Merge tag '0.12.1' into development

Tagging version 0.12.1 0.12.1