Merge branch 'small-dialogs-cleanup'