Merge branch 'develop' into case-2189
case 2189 - Submenu item is wider.
Merge branch 'case-2189' into develop