Merge commit 'e3ec490a410978ee7bd5ce67b378974435e53a53' * commit 'e3ec490a410978ee7bd5ce67b378974435e53a53': New based dialog class.
Merge commit 'e3ec490a410978ee7bd5ce67b378974435e53a53' * commit 'e3ec490a410978ee7bd5ce67b378974435e53a53': New based dialog class.