Update to 2021-07-25

Reverts caching issue
2 jobs for master in 34 seconds (queued for 11 seconds)