v1.2.4, see ChangeLog for details.
Merge branch 'release/1.2.4' into develop