Merge pull request #1021 from TheBlueMatt/2021-07-broken-beta