* Follow up r46117: Add new messages