Merge commit '1ddccd07f744344b5248dd5418ee526f26d520dc' * commit '1ddccd07f744344b5248dd5418ee526f26d520dc': Fix dialog handling.
Merge commit '1ddccd07f744344b5248dd5418ee526f26d520dc' * commit '1ddccd07f744344b5248dd5418ee526f26d520dc': Fix dialog handling.