Preparatory changes for the 2.0.21 release