v1.2.1, see ChangeLog for details.
Merge branch 'release/1.2.1' into develop