Changes from design meeting.

[#54065895]