Current work checkpoint. See diff for details.
Merge branch 'master' into develop
Merge branch 'release/1.2.4'
Merge tag '1.2.4' into develop

Release 1.2.4