Merge pull request #23362 from marination/mr-ux

fix: More MR UX fixes