MenuItem and ToolBarButton fix
Merge branch 'MenuItem-and-ToolBarButton-fix'