1.2.6 WIP

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