2.1.21 release candidate

Includes minor fixes