Picked with Kathy's signoff to master only, since this invokes string changes.
Reminder to move this to a real 2.next milestone later.
Picked with Kathy's signoff to master only, since this invokes string changes.
Reminder to move this to a real 2.next milestone later.