1.2.5 WIP

This PR contains the changes that are to be included in the v1.2.5 release.