FLUID-4947: simplified and improved announcements.