Follow up r49677: Add new messages to maintenance scripts