Merge all of the fixes from the 3.21.0 release.