Prepare for release 1.2.4.
Merge branch 'release-1.2.4' into develop