1.2.1 WIP

Contains work to be included in the v1.2.1 release.