Merge pull request #14839 from colemanw/Menubar