Gary A. Stafford Updating for 2021.05 release