Merge pull request #1699 from TheBlueMatt/2022-08-announcement-rework