Fix menuItem inheritance bug
Merging origin/john/master-pending-menuItem-fix into master