Updated for 3.0.21 release