Dialog fixes
Merge commit '3951c6faf9745ce603a6624c9806458eb065f866'