Merge tag '0.12.1' into develop

Version 0.12.1
Do not use $constraint twice.
Merge branch 'release/0.12.2'