2.1.1 WIP

This PR contains the changes to be included in the v2.1.1 release.