Merge pull request #3144 from TheBlueMatt/2024-06-message-flags