case-2913 - Forms, menus and some additional styles
Merge branch 'case-2913' into development