Version 2021 R07 Fixes

No new fixes made in this release.