Merge branch 'feature/menu-dialogs'