Merge pull request #24896 from prssanna/redesign-fixes