1.2.4 WIP

This PR contains the changes to be included in the v1.2.4 release.