#4139 Menus  -  working, but no tests yet
Merge