Merge pull request #19464 from eileenmcnaughton/menu