Merge branch 'release-2.18.4' into release

Author: raclim

client/components/Menubar/Menubar.test.tsx

@@ -1,7 +1,7 @@
 import React from 'react';
 import { render, screen, fireEvent } from '../../test-utils';
 import { Menubar } from './Menubar';
-import MenubarSubmenu from './MenubarSubmenu';
+import { MenubarSubmenu } from './MenubarSubmenu';
 import { MenubarItem } from './MenubarItem';
 
 describe('Menubar', () => {