WIP 1.2.3

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