WIP 3.0.0

This PR contains the changes to be included in the v3.0.0 release.