Merge pull request #916 from TheBlueMatt/2021-05-fix-disabled-announcements