Merge "Fix bug 4136005 - Extended menus do not work"