Follow-up r58066: Add new messages to maintenance scripts