Merge pull request #1955 from TheBlueMatt/2023-01-1950-message-text