Updates for v1.21 release